[FEATURE] rest refactoring