Stuffer: Added more function wrappers