Changes from old Arch architecture