Update for modern Arch and Fr layout