Move generic machine manipulation from Exec to Machine