fixing entity and dao classes