Added changes to remove Dao