All wrapper functions are now included