Added wrapper classes. Untested, but should work fine if base code did.