Missing refactor