Added a dao indirection layer