Added a DAO layer