Added HaRe refactoring support