Updated to use new Infrastructure code