refactor: hibernate (continue)