REST API related changes