Brought yaml modifications in line with documented spec.