Added (currently untested) class-wrappers