refactor hbm file