Made changes
Made changes in the entities