Wrapper updated

Now the other functions can be implemented here