Added some more wrappers