Updates for REST/JSON API