Added wrapping functions.