Improve the REST API element