Modified infrastrucure script