Added the non-services (e.g. L2 circuits) back into the services and related-services sections; added circuit_type to related-services