Added  DAO support