Added endpoint aliases, endpoints, services, machines.