changed data model and dao