SMVC-20 - Refactor REST handlers