Added BaseDao