improved DAO layer of the app