Separate wrappers in standalone methods
3.2.0