Refactoring, Restored REST functionality