Modified intrastructure script