Updated the wrapper