some changes on DAO objects and entities