Add containers and catalog wide trackers for Service and ServiceBuilder. (Need testing.)