Updated a couple of services to return extra related data.