Enhanced infrastructure for research and education