Arch: Switched structure and window to Units system