Improve REST-api, however, stil not there..