Merge service contacts with host contacts

I restart a pull request because I was on the wrong branch