Enhanced the spec.