Use enhanced DAO implementation class