Added Dao support