Added two new services to try and pull service information from the catalog as well as from an agent

Also updated API a bit