* refactor REST*