Some addition to the API and map front-end