Refactoring all arch