make refactoring support better