Made some changes to Entities