REST reworked