Many changes after rationalising all of the REST services