Added a bunch of classes to work around OneApi limitations.