Added DAO implementation