Make refactoring and hibernate entities