Added some changes in domain and DAO