Added pg_service conf and strip away some unneeded complexity.