Substitute wrapper methods with a scope class (OMS-413)
Cleanup (OMS-413)
Merge pull request #197 from opennode/oms-413

Oms 413