Xtension refactoring.