A few changes to the API, based on the needs from the portal