Modified infrastructure scripts