Re: refactoring support?