API changes, entity checks added