Adding support for Optimus machines