Take care of the 1.11 data model changes - RESTWS-476