Start adding Endpoint definitions