Service Definition - cost field fixes