Substitute wrapper methods with a scope class (OMS-413)