Added a few more wrappers