HOPKINS: More Direction refactoring