Entities and Interfaces expanded