save before refactoring all pojo