added some changes to entities and DAO object

hi, hope at least something will be good...