Refactoring ADF components