Improve rest-api