fixed localization, refactor dao & entity