Worked on the databased and the entity files