Better REST API and services