Add remainding services and split pg code to collector