Refactoring: initial rest interface