Deleted IEntitiy and renamed IDAO