Updated infrastructure