Added entities, services and implementations