orm refactor