        [:ISO_Topic_Category topic-category])
      (for [ak (:AncillaryKeywords s)]
        [:Keyword ak])
-     (for [platform (:Platforms s)
-           instrument (:Instruments platform)]
-       [:Sensor_Name
-        [:Short_Name (:ShortName instrument)]
-        [:Long_Name (:LongName instrument)]])
-     (for [platform (:Platforms s) 
-           :when (not= (:ShortName platform) "Not provided")]
-       [:Source_Name
-        [:Short_Name (:ShortName platform)]
-        [:Long_Name (:LongName platform)]])
-     (for [service-project (:Projects s)]
-       [:Project 
-        [:Short_Name (:ShortName service-project)]
-        [:Long_Name (:LongName service-project)]])
+     (create-sensors s)
+     (create-source-names s)
+     (create-projects s)
      [:Quality (:Quality s)]
      [:AccessConstraints (:AccessContstraints s)]
      [:UseConstraints (:UseConstraints s)]

       [:URL url])
     [:Description (:Description related-url)]]))

(def inserted-metadata
  "Inserted Metadata by CMR to account for missing fields"
  #{"Metadata_Name" "Metadata_Version" "IDN_Node_Short_Name"})

     serf-xml-namespaces
     [:Entry_ID (:EntryId s)]
     [:Entry_Title (:EntryTitle s)]
     (create-service-citations s)
     ;;TODO: CMR-2298 needs to be resolved before we can properly implement this
     (create-root-personnel (:Responsibilities s))
     (create-service-parameters s)
