DAO class  updated