More changes for mcwrapper support