Cleaned Entities API