Use scope class instead of wrapper function (OMS-413)