Updated mwrapper class