Still changing all the wrapper code to conform to the new interface under the hood