Refactored OIORestProvider