Added Entities, Initial API layer