Redesign draft REST API