Make editor compatible with latest cdmlib service layer updates