Changed SingleValueHeaderFieldName to parse to an Option[String] rather than a String