Form for extension order and large refactoring