Updated building system to new format