Changet DAO classes to make them more useful