Ext refactoring