Added Entities and API controllers