Added Generic Dao classes