updated infrastructure schema