Added proper DAO objects.