fix issue with missing entities and methods