Adding support for the GPU and platform options..