entities and entry points added