Add Entities and APIs