Added minor changes to DAO