working on Entities