Added refactored REST gateway,