Updated building services sub-services