Additions for Arch machine