diff --git a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaForcedSource.avsc b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaForcedSource.avsc
index caead79..8f0cfbf 100644
--- a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaForcedSource.avsc
+++ b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaForcedSource.avsc
@@ -19,8 +19,8 @@
       "type": "long"
     },
     {
-      "default": null,
       "doc": "Point Source model flux.",
+      "default": null,
       "name": "psfFlux",
       "type": [
         "null",
@@ -28,8 +28,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of psfFlux.",
+      "default": null,
       "name": "psfFluxErr",
       "type": [
         "null",
@@ -37,8 +37,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "x position at which psfFlux has been measured.",
+      "default": null,
       "name": "x",
       "type": [
         "null",
@@ -46,8 +46,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "y position at which psfFlux has been measured.",
+      "default": null,
       "name": "y",
       "type": [
         "null",
@@ -65,13 +65,29 @@
       "type": "double"
     },
     {
-      "default": null,
       "doc": "Filter band this source was observed with.",
+      "default": null,
       "name": "band",
       "type": [
         "null",
         "string"
       ]
+    },
+    {
+      "logicalType": "timestamp-micros",
+      "doc": "Time when this record was generated.",
+      "name": "time_processed",
+      "type": "long"
+    },
+    {
+      "logicalType": "timestamp-micros",
+      "doc": "Time when this record was marked invalid.",
+      "default": null,
+      "name": "time_withdrawn",
+      "type": [
+        "null",
+        "long"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaObject.avsc b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaObject.avsc
index 5b2c706..c6603f2 100644
--- a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaObject.avsc
+++ b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaObject.avsc
@@ -8,14 +8,20 @@
       "name": "diaObjectId",
       "type": "long"
     },
+    {
+      "logicalType": "timestamp-micros",
+      "doc": "Processing time when validity of this diaObject starts.",
+      "name": "validityStart",
+      "type": "long"
+    },
     {
       "doc": "Right ascension coordinate of the position of the object at time radecMjdTai.",
       "name": "ra",
       "type": "double"
     },
     {
-      "default": null,
       "doc": "Uncertainty of ra.",
+      "default": null,
       "name": "raErr",
       "type": [
         "null",
@@ -28,8 +34,8 @@
       "type": "double"
     },
     {
-      "default": null,
       "doc": "Uncertainty of dec.",
+      "default": null,
       "name": "decErr",
       "type": [
         "null",
@@ -37,8 +43,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance between ra and dec.",
+      "default": null,
       "name": "ra_dec_Cov",
       "type": [
         "null",
@@ -46,8 +52,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Time at which the object was at a position ra/dec, expressed as Modified Julian Date, International Atomic Time.",
+      "default": null,
       "name": "radecMjdTai",
       "type": [
         "null",
@@ -55,8 +61,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Proper motion in right ascension.",
+      "default": null,
       "name": "pmRa",
       "type": [
         "null",
@@ -64,8 +70,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of pmRa.",
+      "default": null,
       "name": "pmRaErr",
       "type": [
         "null",
@@ -73,8 +79,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Proper motion of declination.",
+      "default": null,
       "name": "pmDec",
       "type": [
         "null",
@@ -82,8 +88,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of pmDec.",
+      "default": null,
       "name": "pmDecErr",
       "type": [
         "null",
@@ -91,8 +97,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Parallax.",
+      "default": null,
       "name": "parallax",
       "type": [
         "null",
@@ -100,8 +106,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of parallax.",
+      "default": null,
       "name": "parallaxErr",
       "type": [
         "null",
@@ -109,8 +115,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of pmRa and pmDec.",
+      "default": null,
       "name": "pmRa_pmDec_Cov",
       "type": [
         "null",
@@ -118,8 +124,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of pmRa and parallax.",
+      "default": null,
       "name": "pmRa_parallax_Cov",
       "type": [
         "null",
@@ -127,8 +133,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of pmDec and parallax.",
+      "default": null,
       "name": "pmDec_parallax_Cov",
       "type": [
         "null",
@@ -136,8 +142,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Natural log of the likelihood of the linear proper motion parallax fit.",
+      "default": null,
       "name": "pmParallaxLnL",
       "type": [
         "null",
@@ -145,8 +151,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 static of the model fit.",
+      "default": null,
       "name": "pmParallaxChi2",
       "type": [
         "null",
@@ -154,8 +160,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to fit the model.",
+      "default": null,
       "name": "pmParallaxNdata",
       "type": [
         "null",
@@ -163,8 +169,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean point-source model magnitude for u filter.",
+      "default": null,
       "name": "u_psfFluxMean",
       "type": [
         "null",
@@ -172,8 +178,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of u_psfFluxMean.",
+      "default": null,
       "name": "u_psfFluxMeanErr",
       "type": [
         "null",
@@ -181,8 +187,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of u_psfFlux.",
+      "default": null,
       "name": "u_psfFluxSigma",
       "type": [
         "null",
@@ -190,8 +196,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic for the scatter of u_psfFlux around u_psfFluxMean.",
+      "default": null,
       "name": "u_psfFluxChi2",
       "type": [
         "null",
@@ -199,8 +205,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to compute u_psfFluxChi2.",
+      "default": null,
       "name": "u_psfFluxNdata",
       "type": [
         "null",
@@ -208,8 +214,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean forced photometry flux for u filter.",
+      "default": null,
       "name": "u_fpFluxMean",
       "type": [
         "null",
@@ -217,8 +223,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of u_fpFluxMean.",
+      "default": null,
       "name": "u_fpFluxMeanErr",
       "type": [
         "null",
@@ -226,8 +232,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of u_fpFlux.",
+      "default": null,
       "name": "u_fpFluxSigma",
       "type": [
         "null",
@@ -235,8 +241,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean point-source model magnitude for g filter.",
+      "default": null,
       "name": "g_psfFluxMean",
       "type": [
         "null",
@@ -244,8 +250,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of g_psfFluxMean.",
+      "default": null,
       "name": "g_psfFluxMeanErr",
       "type": [
         "null",
@@ -253,17 +259,17 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of g_psfFlux.",
-      "name": "g_psfFluxErr",
+      "default": null,
+      "name": "g_psfFluxSigma",
       "type": [
         "null",
         "float"
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic for the scatter of g_psfFlux around g_psfFluxMean.",
+      "default": null,
       "name": "g_psfFluxChi2",
       "type": [
         "null",
@@ -271,8 +277,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to compute g_psfFluxChi2.",
+      "default": null,
       "name": "g_psfFluxNdata",
       "type": [
         "null",
@@ -280,8 +286,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean forced photometry flux for g filter.",
+      "default": null,
       "name": "g_fpFluxMean",
       "type": [
         "null",
@@ -289,8 +295,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of g_fpFluxMean.",
+      "default": null,
       "name": "g_fpFluxMeanErr",
       "type": [
         "null",
@@ -298,8 +304,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of g_fpFlux.",
+      "default": null,
       "name": "g_fpFluxSigma",
       "type": [
         "null",
@@ -307,8 +313,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean point-source model magnitude for r filter.",
+      "default": null,
       "name": "r_psfFluxMean",
       "type": [
         "null",
@@ -316,8 +322,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of r_psfFluxMean.",
+      "default": null,
       "name": "r_psfFluxMeanErr",
       "type": [
         "null",
@@ -325,8 +331,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of r_psfFlux.",
+      "default": null,
       "name": "r_psfFluxSigma",
       "type": [
         "null",
@@ -334,8 +340,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic for the scatter of r_psfFlux around r_psfFluxMean.",
+      "default": null,
       "name": "r_psfFluxChi2",
       "type": [
         "null",
@@ -343,8 +349,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to compute r_psfFluxChi2.",
+      "default": null,
       "name": "r_psfFluxNdata",
       "type": [
         "null",
@@ -352,8 +358,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean forced photometry flux for r filter.",
+      "default": null,
       "name": "r_fpFluxMean",
       "type": [
         "null",
@@ -361,8 +367,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of r_fpFluxMean.",
+      "default": null,
       "name": "r_fpFluxMeanErr",
       "type": [
         "null",
@@ -370,8 +376,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of r_fpFlux.",
+      "default": null,
       "name": "r_fpFluxSigma",
       "type": [
         "null",
@@ -379,8 +385,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean point-source model magnitude for i filter.",
+      "default": null,
       "name": "i_psfFluxMean",
       "type": [
         "null",
@@ -388,8 +394,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of i_psfFluxMean.",
+      "default": null,
       "name": "i_psfFluxMeanErr",
       "type": [
         "null",
@@ -397,8 +403,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of i_psfFlux.",
+      "default": null,
       "name": "i_psfFluxSigma",
       "type": [
         "null",
@@ -406,8 +412,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic for the scatter of i_psfFlux around i_psfFluxMean.",
+      "default": null,
       "name": "i_psfFluxChi2",
       "type": [
         "null",
@@ -415,8 +421,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to compute i_psfFluxChi2.",
+      "default": null,
       "name": "i_psfFluxNdata",
       "type": [
         "null",
@@ -424,8 +430,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean forced photometry flux for i filter.",
+      "default": null,
       "name": "i_fpFluxMean",
       "type": [
         "null",
@@ -433,8 +439,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of i_fpFluxMean.",
+      "default": null,
       "name": "i_fpFluxMeanErr",
       "type": [
         "null",
@@ -442,8 +448,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of i_fpFlux.",
+      "default": null,
       "name": "i_fpFluxSigma",
       "type": [
         "null",
@@ -451,8 +457,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean point-source model magnitude for z filter.",
+      "default": null,
       "name": "z_psfFluxMean",
       "type": [
         "null",
@@ -460,8 +466,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of z_psfFluxMean.",
+      "default": null,
       "name": "z_psfFluxMeanErr",
       "type": [
         "null",
@@ -469,8 +475,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of z_psfFlux.",
+      "default": null,
       "name": "z_psfFluxSigma",
       "type": [
         "null",
@@ -478,8 +484,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic for the scatter of z_psfFlux around z_psfFluxMean.",
+      "default": null,
       "name": "z_psfFluxChi2",
       "type": [
         "null",
@@ -487,8 +493,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to compute z_psfFluxChi2.",
+      "default": null,
       "name": "z_psfFluxNdata",
       "type": [
         "null",
@@ -496,8 +502,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean forced photometry flux for z filter.",
+      "default": null,
       "name": "z_fpFluxMean",
       "type": [
         "null",
@@ -505,8 +511,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of z_fpFluxMean.",
+      "default": null,
       "name": "z_fpFluxMeanErr",
       "type": [
         "null",
@@ -514,8 +520,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of z_fpFlux.",
+      "default": null,
       "name": "z_fpFluxSigma",
       "type": [
         "null",
@@ -523,8 +529,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean point-source model magnitude for y filter.",
+      "default": null,
       "name": "y_psfFluxMean",
       "type": [
         "null",
@@ -532,8 +538,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of y_psfFluxMean.",
+      "default": null,
       "name": "y_psfFluxMeanErr",
       "type": [
         "null",
@@ -541,8 +547,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of y_psfFlux.",
+      "default": null,
       "name": "y_psfFluxSigma",
       "type": [
         "null",
@@ -550,8 +556,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic for the scatter of y_psfFlux around y_psfFluxMean.",
+      "default": null,
       "name": "y_psfFluxChi2",
       "type": [
         "null",
@@ -559,8 +565,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to compute y_psfFluxChi2.",
+      "default": null,
       "name": "y_psfFluxNdata",
       "type": [
         "null",
@@ -568,8 +574,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Weighted mean forced photometry flux for y filter.",
+      "default": null,
       "name": "y_fpFluxMean",
       "type": [
         "null",
@@ -577,8 +583,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard error of y_fpFluxMean.",
+      "default": null,
       "name": "y_fpFluxMeanErr",
       "type": [
         "null",
@@ -586,8 +592,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Standard deviation of the distribution of y_fpFlux.",
+      "default": null,
       "name": "y_fpFluxSigma",
       "type": [
         "null",
@@ -595,8 +601,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Id of the closest nearby object.",
+      "default": null,
       "name": "nearbyObj1",
       "type": [
         "null",
@@ -604,8 +610,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Distance to nearbyObj1.",
+      "default": null,
       "name": "nearbyObj1Dist",
       "type": [
         "null",
@@ -613,8 +619,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Natural log of the probability that the observed diaObject is the same as the nearbyObj1.",
+      "default": null,
       "name": "nearbyObj1LnP",
       "type": [
         "null",
@@ -622,8 +628,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Id of the second-closest nearby object.",
+      "default": null,
       "name": "nearbyObj2",
       "type": [
         "null",
@@ -631,8 +637,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Distance to nearbyObj2.",
+      "default": null,
       "name": "nearbyObj2Dist",
       "type": [
         "null",
@@ -640,8 +646,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Natural log of the probability that the observed diaObject is the same as the nearbyObj2.",
+      "default": null,
       "name": "nearbyObj2LnP",
       "type": [
         "null",
@@ -649,8 +655,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Id of the third-closest nearby object.",
+      "default": null,
       "name": "nearbyObj3",
       "type": [
         "null",
@@ -658,8 +664,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Distance to nearbyObj3.",
+      "default": null,
       "name": "nearbyObj3Dist",
       "type": [
         "null",
@@ -667,8 +673,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Natural log of the probability that the observed diaObject is the same as the nearbyObj3.",
+      "default": null,
       "name": "nearbyObj3LnP",
       "type": [
         "null",
@@ -676,8 +682,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Mean of the u band flux errors.",
+      "default": null,
       "name": "u_psfFluxErrMean",
       "type": [
         "null",
@@ -685,8 +691,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Mean of the g band flux errors.",
+      "default": null,
       "name": "g_psfFluxErrMean",
       "type": [
         "null",
@@ -694,8 +700,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Mean of the r band flux errors.",
+      "default": null,
       "name": "r_psfFluxErrMean",
       "type": [
         "null",
@@ -703,8 +709,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Mean of the i band flux errors.",
+      "default": null,
       "name": "i_psfFluxErrMean",
       "type": [
         "null",
@@ -712,8 +718,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Mean of the z band flux errors.",
+      "default": null,
       "name": "z_psfFluxErrMean",
       "type": [
         "null",
@@ -721,8 +727,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Mean of the y band flux errors.",
+      "default": null,
       "name": "y_psfFluxErrMean",
       "type": [
         "null",
diff --git a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaSource.avsc b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaSource.avsc
index a409a91..182c583 100644
--- a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaSource.avsc
+++ b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaSource.avsc
@@ -14,8 +14,8 @@
       "type": "long"
     },
     {
-      "default": null,
       "doc": "Id of the diaObject this source was associated with, if any. If not, it is set to NULL (each diaSource will be associated with either a diaObject or ssObject).",
+      "default": null,
       "name": "diaObjectId",
       "type": [
         "null",
@@ -23,8 +23,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Id of the ssObject this source was associated with, if any. If not, it is set to NULL (each diaSource will be associated with either a diaObject or ssObject).",
+      "default": null,
       "name": "ssObjectId",
       "type": [
         "null",
@@ -32,14 +32,24 @@
       ]
     },
     {
-      "default": null,
       "doc": "Id of the parent diaSource this diaSource has been deblended from, if any.",
+      "default": null,
       "name": "parentDiaSourceId",
       "type": [
         "null",
         "long"
       ]
     },
+    {
+      "logicalType": "timestamp-micros",
+      "doc": "Time when this diaSource was reassociated from diaObject to ssObject (if such reassociation happens, otherwise NULL).",
+      "default": null,
+      "name": "ssObjectReassocTime",
+      "type": [
+        "null",
+        "long"
+      ]
+    },
     {
       "doc": "Effective mid-visit time for this diaSource, expressed as Modified Julian Date, International Atomic Time.",
       "name": "midpointMjdTai",
@@ -51,8 +61,8 @@
       "type": "double"
     },
     {
-      "default": null,
       "doc": "Uncertainty of ra.",
+      "default": null,
       "name": "raErr",
       "type": [
         "null",
@@ -65,8 +75,8 @@
       "type": "double"
     },
     {
-      "default": null,
       "doc": "Uncertainty of dec.",
+      "default": null,
       "name": "decErr",
       "type": [
         "null",
@@ -74,8 +84,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance between ra and dec.",
+      "default": null,
       "name": "ra_dec_Cov",
       "type": [
         "null",
@@ -88,8 +98,8 @@
       "type": "float"
     },
     {
-      "default": null,
       "doc": "Uncertainty of x.",
+      "default": null,
       "name": "xErr",
       "type": [
         "null",
@@ -102,8 +112,8 @@
       "type": "float"
     },
     {
-      "default": null,
       "doc": "Uncertainty of y.",
+      "default": null,
       "name": "yErr",
       "type": [
         "null",
@@ -111,8 +121,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance between x and y.",
+      "default": null,
       "name": "x_y_Cov",
       "type": [
         "null",
@@ -120,8 +130,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Flux in a 12 pixel radius aperture on the difference image.",
+      "default": null,
       "name": "apFlux",
       "type": [
         "null",
@@ -129,8 +139,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Estimated uncertainty of apFlux.",
+      "default": null,
       "name": "apFluxErr",
       "type": [
         "null",
@@ -138,8 +148,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The signal-to-noise ratio at which this source was detected in the difference image.",
+      "default": null,
       "name": "snr",
       "type": [
         "null",
@@ -147,8 +157,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Flux for Point Source model. Note this actually measures the flux difference between the template and the visit image.",
+      "default": null,
       "name": "psfFlux",
       "type": [
         "null",
@@ -156,8 +166,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of psfFlux.",
+      "default": null,
       "name": "psfFluxErr",
       "type": [
         "null",
@@ -165,8 +175,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Right ascension coordinate of centroid for point source model.",
+      "default": null,
       "name": "psfRa",
       "type": [
         "null",
@@ -174,8 +184,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of psfRa.",
+      "default": null,
       "name": "psfRaErr",
       "type": [
         "null",
@@ -183,8 +193,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Declination coordinate of centroid for point source model.",
+      "default": null,
       "name": "psfDec",
       "type": [
         "null",
@@ -192,8 +202,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of psfDec.",
+      "default": null,
       "name": "psfDecErr",
       "type": [
         "null",
@@ -201,8 +211,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance between psfFlux and psfRa.",
+      "default": null,
       "name": "psfFlux_psfRa_Cov",
       "type": [
         "null",
@@ -210,8 +220,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance between psfFlux and psfDec.",
+      "default": null,
       "name": "psfFlux_psfDec_Cov",
       "type": [
         "null",
@@ -219,8 +229,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance between psfRa and psfDec.",
+      "default": null,
       "name": "psfRa_psfDec_Cov",
       "type": [
         "null",
@@ -228,8 +238,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Natural log likelihood of the observed data given the point source model.",
+      "default": null,
       "name": "psfLnL",
       "type": [
         "null",
@@ -237,8 +247,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the point source model fit.",
+      "default": null,
       "name": "psfChi2",
       "type": [
         "null",
@@ -246,8 +256,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points (pixels) used to fit the point source model.",
+      "default": null,
       "name": "psfNdata",
       "type": [
         "null",
@@ -255,8 +265,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Flux for a trailed source model. Note this actually measures the flux difference between the template and the visit image.",
+      "default": null,
       "name": "trailFlux",
       "type": [
         "null",
@@ -264,8 +274,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of trailFlux.",
+      "default": null,
       "name": "trailFluxErr",
       "type": [
         "null",
@@ -273,8 +283,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Right ascension coordinate of centroid for trailed source model.",
+      "default": null,
       "name": "trailRa",
       "type": [
         "null",
@@ -282,8 +292,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of trailRa.",
+      "default": null,
       "name": "trailRaErr",
       "type": [
         "null",
@@ -291,8 +301,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Declination coordinate of centroid for trailed source model.",
+      "default": null,
       "name": "trailDec",
       "type": [
         "null",
@@ -300,8 +310,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of trailDec.",
+      "default": null,
       "name": "trailDecErr",
       "type": [
         "null",
@@ -309,8 +319,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Maximum likelihood fit of trail length.",
+      "default": null,
       "name": "trailLength",
       "type": [
         "null",
@@ -318,8 +328,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of trailLength.",
+      "default": null,
       "name": "trailLengthErr",
       "type": [
         "null",
@@ -327,8 +337,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Maximum likelihood fit of the angle between the meridian through the centroid and the trail direction (bearing).",
+      "default": null,
       "name": "trailAngle",
       "type": [
         "null",
@@ -336,8 +346,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of trailAngle.",
+      "default": null,
       "name": "trailAngleErr",
       "type": [
         "null",
@@ -345,8 +355,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailFlux and trailRa.",
+      "default": null,
       "name": "trailFlux_trailRa_Cov",
       "type": [
         "null",
@@ -354,8 +364,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailFlux and trailDec.",
+      "default": null,
       "name": "trailFlux_trailDec_Cov",
       "type": [
         "null",
@@ -363,8 +373,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailFlux and trailLength",
+      "default": null,
       "name": "trailFlux_trailLength_Cov",
       "type": [
         "null",
@@ -372,8 +382,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailFlux and trailAngle",
+      "default": null,
       "name": "trailFlux_trailAngle_Cov",
       "type": [
         "null",
@@ -381,8 +391,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailRa and trailDec.",
+      "default": null,
       "name": "trailRa_trailDec_Cov",
       "type": [
         "null",
@@ -390,8 +400,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailRa and trailLength.",
+      "default": null,
       "name": "trailRa_trailLength_Cov",
       "type": [
         "null",
@@ -399,8 +409,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailRa and trailAngle.",
+      "default": null,
       "name": "trailRa_trailAngle_Cov",
       "type": [
         "null",
@@ -408,8 +418,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailDec and trailLength.",
+      "default": null,
       "name": "trailDec_trailLength_Cov",
       "type": [
         "null",
@@ -417,8 +427,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailDec and trailAngle.",
+      "default": null,
       "name": "trailDec_trailAngle_Cov",
       "type": [
         "null",
@@ -426,8 +436,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of trailLength and trailAngle",
+      "default": null,
       "name": "trailLength_trailAngle_Cov",
       "type": [
         "null",
@@ -435,8 +445,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Natural log likelihood of the observed data given the trailed source model.",
+      "default": null,
       "name": "trailLnL",
       "type": [
         "null",
@@ -444,8 +454,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the trailed source model fit.",
+      "default": null,
       "name": "trailChi2",
       "type": [
         "null",
@@ -453,8 +463,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points (pixels) used to fit the trailed source model.",
+      "default": null,
       "name": "trailNdata",
       "type": [
         "null",
@@ -462,8 +472,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Maximum likelihood value for the mean absolute flux of the two lobes for a dipole model.",
+      "default": null,
       "name": "dipoleMeanFlux",
       "type": [
         "null",
@@ -471,8 +481,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of dipoleMeanFlux.",
+      "default": null,
       "name": "dipoleMeanFluxErr",
       "type": [
         "null",
@@ -480,8 +490,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Maximum likelihood value for the difference of absolute fluxes of the two lobes for a dipole model.",
+      "default": null,
       "name": "dipoleFluxDiff",
       "type": [
         "null",
@@ -489,8 +499,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of dipoleFluxDiff.",
+      "default": null,
       "name": "dipoleFluxDiffErr",
       "type": [
         "null",
@@ -498,8 +508,8 @@
       ]
     },
     {
-      "default": null,
       "doc": " Right ascension coordinate of centroid for dipole model.",
+      "default": null,
       "name": "dipoleRa",
       "type": [
         "null",
@@ -507,8 +517,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of dipoleRa.",
+      "default": null,
       "name": "dipoleRaErr",
       "type": [
         "null",
@@ -516,8 +526,8 @@
       ]
     },
     {
-      "default": null,
       "doc": " Declination coordinate of centroid for dipole model.",
+      "default": null,
       "name": "dipoleDec",
       "type": [
         "null",
@@ -525,8 +535,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of dipoleDec.",
+      "default": null,
       "name": "dipoleDecErr",
       "type": [
         "null",
@@ -534,8 +544,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Maximum likelihood value for the lobe separation in dipole model.",
+      "default": null,
       "name": "dipoleLength",
       "type": [
         "null",
@@ -543,8 +553,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of dipoleLength.",
+      "default": null,
       "name": "dipoleLengthErr",
       "type": [
         "null",
@@ -552,8 +562,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Maximum likelihood fit of the angle between the meridian through the centroid and the dipole direction (bearing, from negative to positive lobe).",
+      "default": null,
       "name": "dipoleAngle",
       "type": [
         "null",
@@ -561,8 +571,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of dipoleAngle.",
+      "default": null,
       "name": "dipoleAngleErr",
       "type": [
         "null",
@@ -570,8 +580,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleMeanFlux and dipoleFluxDiff.",
+      "default": null,
       "name": "dipoleMeanFlux_dipoleFluxDiff_Cov",
       "type": [
         "null",
@@ -579,8 +589,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleMeanFlux and dipoleRa.",
+      "default": null,
       "name": "dipoleMeanFlux_dipoleRa_Cov",
       "type": [
         "null",
@@ -588,8 +598,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleMeanFlux and dipoleDec.",
+      "default": null,
       "name": "dipoleMeanFlux_dipoleDec_Cov",
       "type": [
         "null",
@@ -597,8 +607,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleMeanFlux and dipoleLength.",
+      "default": null,
       "name": "dipoleMeanFlux_dipoleLength_Cov",
       "type": [
         "null",
@@ -606,8 +616,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleMeanFlux and dipoleAngle.",
+      "default": null,
       "name": "dipoleMeanFlux_dipoleAngle_Cov",
       "type": [
         "null",
@@ -615,8 +625,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleFluxDiff and dipoleRa.",
+      "default": null,
       "name": "dipoleFluxDiff_dipoleRa_Cov",
       "type": [
         "null",
@@ -624,8 +634,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleFluxDiff and dipoleDec.",
+      "default": null,
       "name": "dipoleFluxDiff_dipoleDec_Cov",
       "type": [
         "null",
@@ -633,8 +643,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleFluxDiff and dipoleLength.",
+      "default": null,
       "name": "dipoleFluxDiff_dipoleLength_Cov",
       "type": [
         "null",
@@ -642,8 +652,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleFluxDiff and dipoleAngle.",
+      "default": null,
       "name": "dipoleFluxDiff_dipoleAngle_Cov",
       "type": [
         "null",
@@ -651,8 +661,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleRa and dipoleDec.",
+      "default": null,
       "name": "dipoleRa_dipoleDec_Cov",
       "type": [
         "null",
@@ -660,8 +670,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleRa and dipoleLength.",
+      "default": null,
       "name": "dipoleRa_dipoleLength_Cov",
       "type": [
         "null",
@@ -669,8 +679,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleRa and dipoleAngle.",
+      "default": null,
       "name": "dipoleRa_dipoleAngle_Cov",
       "type": [
         "null",
@@ -678,8 +688,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleDec and dipoleLength.",
+      "default": null,
       "name": "dipoleDec_dipoleLength_Cov",
       "type": [
         "null",
@@ -687,8 +697,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleDec and dipoleAngle.",
+      "default": null,
       "name": "dipoleDec_dipoleAngle_Cov",
       "type": [
         "null",
@@ -696,8 +706,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of dipoleLength and dipoleAngle.",
+      "default": null,
       "name": "dipoleLength_dipoleAngle_Cov",
       "type": [
         "null",
@@ -705,8 +715,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Natural log likelihood of the observed data given the dipole source model.",
+      "default": null,
       "name": "dipoleLnL",
       "type": [
         "null",
@@ -714,8 +724,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the model fit.",
+      "default": null,
       "name": "dipoleChi2",
       "type": [
         "null",
@@ -723,8 +733,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points (pixels) used to fit the model.",
+      "default": null,
       "name": "dipoleNdata",
       "type": [
         "null",
@@ -732,8 +742,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Calibrated flux for Point Source model centered on radec but measured on the difference of snaps comprising this visit.",
+      "default": null,
       "name": "snapDiffFlux",
       "type": [
         "null",
@@ -741,8 +751,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Estimated uncertainty of snapDiffFlux.",
+      "default": null,
       "name": "snapDiffFluxErr",
       "type": [
         "null",
@@ -750,8 +760,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Estimated sky background at the position (centroid) of the object.",
+      "default": null,
       "name": "fpBkgd",
       "type": [
         "null",
@@ -759,8 +769,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Estimated uncertainty of fpBkgd.",
+      "default": null,
       "name": "fpBkgdErr",
       "type": [
         "null",
@@ -768,8 +778,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Adaptive second moment of the source intensity.",
+      "default": null,
       "name": "ixx",
       "type": [
         "null",
@@ -777,8 +787,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of ixx.",
+      "default": null,
       "name": "ixxErr",
       "type": [
         "null",
@@ -786,8 +796,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Adaptive second moment of the source intensity.",
+      "default": null,
       "name": "iyy",
       "type": [
         "null",
@@ -795,8 +805,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of iyy.",
+      "default": null,
       "name": "iyyErr",
       "type": [
         "null",
@@ -804,8 +814,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Adaptive second moment of the source intensity.",
+      "default": null,
       "name": "ixy",
       "type": [
         "null",
@@ -813,8 +823,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of ixy.",
+      "default": null,
       "name": "ixyErr",
       "type": [
         "null",
@@ -822,8 +832,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of ixx and iyy.",
+      "default": null,
       "name": "ixx_iyy_Cov",
       "type": [
         "null",
@@ -831,8 +841,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of ixx and ixy.",
+      "default": null,
       "name": "ixx_ixy_Cov",
       "type": [
         "null",
@@ -840,8 +850,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Covariance of iyy and ixy.",
+      "default": null,
       "name": "iyy_ixy_Cov",
       "type": [
         "null",
@@ -849,8 +859,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Adaptive second moment for the PSF.",
+      "default": null,
       "name": "ixxPSF",
       "type": [
         "null",
@@ -858,8 +868,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Adaptive second moment for the PSF.",
+      "default": null,
       "name": "iyyPSF",
       "type": [
         "null",
@@ -867,8 +877,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Adaptive second moment for the PSF.",
+      "default": null,
       "name": "ixyPSF",
       "type": [
         "null",
@@ -876,8 +886,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "A measure of extendedness, Computed using a combination of available moments and model fluxes or from a likelihood ratio of point/trailed source models (exact algorithm TBD). extendedness = 1 implies a high degree of confidence that the source is extended. extendedness = 0 implies a high degree of confidence that the source is point-like.",
+      "default": null,
       "name": "extendedness",
       "type": [
         "null",
@@ -885,8 +895,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "A measure of reliability, computed using information from the source and image characterization, as well as the information on the Telescope and Camera system (e.g., ghost maps, defect maps, etc.).",
+      "default": null,
       "name": "reliability",
       "type": [
         "null",
@@ -899,13 +909,29 @@
       "type": "long"
     },
     {
-      "default": null,
       "doc": "Filter band this source was observed with.",
+      "default": null,
       "name": "band",
       "type": [
         "null",
         "string"
       ]
+    },
+    {
+      "logicalType": "timestamp-micros",
+      "doc": "Time when the image was processed and this DiaSource record was generated.",
+      "name": "time_processed",
+      "type": "long"
+    },
+    {
+      "logicalType": "timestamp-micros",
+      "doc": "Time when this record was marked invalid.",
+      "default": null,
+      "name": "time_withdrawn",
+      "type": [
+        "null",
+        "long"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.ssObject.avsc b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.ssObject.avsc
index 46a1984..97c6041 100644
--- a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.ssObject.avsc
+++ b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.ssObject.avsc
@@ -9,8 +9,8 @@
       "type": "long"
     },
     {
-      "default": null,
       "doc": "The date the LSST first linked and submitted the discovery observations to the MPC. May be NULL if not an LSST discovery. The date format will follow general LSST conventions (MJD TAI, at the moment).",
+      "default": null,
       "name": "discoverySubmissionDate",
       "type": [
         "null",
@@ -18,8 +18,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The time of the first LSST observation of this object (could be precovered) as Modified Julian Date, International Atomic Time.",
+      "default": null,
       "name": "firstObservationDate",
       "type": [
         "null",
@@ -27,8 +27,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Arc of LSST observations.",
+      "default": null,
       "name": "arc",
       "type": [
         "null",
@@ -36,8 +36,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Number of LSST observations of this object.",
+      "default": null,
       "name": "numObs",
       "type": [
         "null",
@@ -45,8 +45,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Minimum orbit intersection distance to Earth.",
+      "default": null,
       "name": "MOID",
       "type": [
         "null",
@@ -54,8 +54,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "True anomaly of the MOID point.",
+      "default": null,
       "name": "MOIDTrueAnomaly",
       "type": [
         "null",
@@ -63,8 +63,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Ecliptic longitude of the MOID point.",
+      "default": null,
       "name": "MOIDEclipticLongitude",
       "type": [
         "null",
@@ -72,8 +72,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "DeltaV at the MOID point.",
+      "default": null,
       "name": "MOIDDeltaV",
       "type": [
         "null",
@@ -81,8 +81,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit absolute magnitude (u band).",
+      "default": null,
       "name": "u_H",
       "type": [
         "null",
@@ -90,8 +90,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit G12 slope parameter (u band).",
+      "default": null,
       "name": "u_G12",
       "type": [
         "null",
@@ -99,8 +99,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of H (u band).",
+      "default": null,
       "name": "u_HErr",
       "type": [
         "null",
@@ -108,8 +108,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of G12 (u band).",
+      "default": null,
       "name": "u_G12Err",
       "type": [
         "null",
@@ -117,8 +117,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "H-G12 covariance (u band).",
+      "default": null,
       "name": "u_H_u_G12_Cov",
       "type": [
         "null",
@@ -126,8 +126,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the phase curve fit (u band).",
+      "default": null,
       "name": "u_Chi2",
       "type": [
         "null",
@@ -135,8 +135,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to fit the phase curve (u band).",
+      "default": null,
       "name": "u_Ndata",
       "type": [
         "null",
@@ -144,8 +144,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit absolute magnitude (g band).",
+      "default": null,
       "name": "g_H",
       "type": [
         "null",
@@ -153,8 +153,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit G12 slope parameter (g band).",
+      "default": null,
       "name": "g_G12",
       "type": [
         "null",
@@ -162,8 +162,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of H (g band).",
+      "default": null,
       "name": "g_HErr",
       "type": [
         "null",
@@ -171,8 +171,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of G12 (g band).",
+      "default": null,
       "name": "g_G12Err",
       "type": [
         "null",
@@ -180,8 +180,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "H-G12 covariance (g band).",
+      "default": null,
       "name": "g_H_g_G12_Cov",
       "type": [
         "null",
@@ -189,8 +189,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the phase curve fit (g band).",
+      "default": null,
       "name": "g_Chi2",
       "type": [
         "null",
@@ -198,8 +198,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to fit the phase curve (g band).",
+      "default": null,
       "name": "g_Ndata",
       "type": [
         "null",
@@ -207,8 +207,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit absolute magnitude (r band).",
+      "default": null,
       "name": "r_H",
       "type": [
         "null",
@@ -216,8 +216,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit G12 slope parameter (r band).",
+      "default": null,
       "name": "r_G12",
       "type": [
         "null",
@@ -225,8 +225,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of H (r band).",
+      "default": null,
       "name": "r_HErr",
       "type": [
         "null",
@@ -234,8 +234,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of G12 (r band).",
+      "default": null,
       "name": "r_G12Err",
       "type": [
         "null",
@@ -243,8 +243,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "H-G12 covariance (r band).",
+      "default": null,
       "name": "r_H_r_G12_Cov",
       "type": [
         "null",
@@ -252,8 +252,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the phase curve fit (r band).",
+      "default": null,
       "name": "r_Chi2",
       "type": [
         "null",
@@ -261,8 +261,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to fit the phase curve (r band).",
+      "default": null,
       "name": "r_Ndata",
       "type": [
         "null",
@@ -270,8 +270,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit absolute magnitude (i band).",
+      "default": null,
       "name": "i_H",
       "type": [
         "null",
@@ -279,8 +279,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit G12 slope parameter (i band).",
+      "default": null,
       "name": "i_G12",
       "type": [
         "null",
@@ -288,8 +288,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of H (i band).",
+      "default": null,
       "name": "i_HErr",
       "type": [
         "null",
@@ -297,8 +297,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of G12 (i band).",
+      "default": null,
       "name": "i_G12Err",
       "type": [
         "null",
@@ -306,8 +306,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "H-G12 covariance (i band).",
+      "default": null,
       "name": "i_H_i_G12_Cov",
       "type": [
         "null",
@@ -315,8 +315,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the phase curve fit (i band).",
+      "default": null,
       "name": "i_Chi2",
       "type": [
         "null",
@@ -324,8 +324,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to fit the phase curve (i band).",
+      "default": null,
       "name": "i_Ndata",
       "type": [
         "null",
@@ -333,8 +333,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit absolute magnitude (z band).",
+      "default": null,
       "name": "z_H",
       "type": [
         "null",
@@ -342,8 +342,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit G12 slope parameter (z band).",
+      "default": null,
       "name": "z_G12",
       "type": [
         "null",
@@ -351,8 +351,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of H (z band).",
+      "default": null,
       "name": "z_HErr",
       "type": [
         "null",
@@ -360,8 +360,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of G12 (z band).",
+      "default": null,
       "name": "z_G12Err",
       "type": [
         "null",
@@ -369,8 +369,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "H-G12 covariance (z band).",
+      "default": null,
       "name": "z_H_z_G12_Cov",
       "type": [
         "null",
@@ -378,8 +378,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the phase curve fit (z band).",
+      "default": null,
       "name": "z_Chi2",
       "type": [
         "null",
@@ -387,8 +387,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to fit the phase curve (z band).",
+      "default": null,
       "name": "z_Ndata",
       "type": [
         "null",
@@ -396,8 +396,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit absolute magnitude (y band).",
+      "default": null,
       "name": "y_H",
       "type": [
         "null",
@@ -405,8 +405,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Best fit G12 slope parameter (y band).",
+      "default": null,
       "name": "y_G12",
       "type": [
         "null",
@@ -414,8 +414,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of H (y band).",
+      "default": null,
       "name": "y_HErr",
       "type": [
         "null",
@@ -423,8 +423,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of G12 (y band).",
+      "default": null,
       "name": "y_G12Err",
       "type": [
         "null",
@@ -432,8 +432,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "H-G12 covariance (y band).",
+      "default": null,
       "name": "y_H_y_G12_Cov",
       "type": [
         "null",
@@ -441,8 +441,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "Chi^2 statistic of the phase curve fit (y band).",
+      "default": null,
       "name": "y_Chi2",
       "type": [
         "null",
@@ -450,8 +450,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "The number of data points used to fit the phase curve (y band).",
+      "default": null,
       "name": "y_Ndata",
       "type": [
         "null",
@@ -459,8 +459,8 @@
       ]
     },
     {
-      "default": null,
       "doc": "median `extendedness` value from the DIASource.",
+      "default": null,
       "name": "medianExtendedness",
       "type": [
         "null",
diff --git a/python/lsst/alert/packet/schema/6/0/sample_data/fakeAlert.avro b/python/lsst/alert/packet/schema/6/0/sample_data/fakeAlert.avro
index 1c62f85..a21a3fd 100644
Binary files a/python/lsst/alert/packet/schema/6/0/sample_data/fakeAlert.avro and b/python/lsst/alert/packet/schema/6/0/sample_data/fakeAlert.avro differ
diff --git a/python/lsst/alert/packet/updateSchema.py b/python/lsst/alert/packet/updateSchema.py
index 3c28b42..15edc77 100644
--- a/python/lsst/alert/packet/updateSchema.py
+++ b/python/lsst/alert/packet/updateSchema.py
@@ -25,6 +25,7 @@
 import yaml
 import json
 
+
 __all__ = ['generate_schema']
 
 
@@ -117,16 +118,12 @@ def populate_fields(apdb_table):
 
             if is_timestamp:
                 field['logicalType'] = 'timestamp-micros'
-            if column['name'] == 'validityStart':
-                print(field)
             field_dictionary_array.append(field)
-            if column['name'] == 'validityStart':
-                print(field_dictionary_array[-1])
 
     return field_dictionary_array
 
 
-def create_schema(name, field_dictionary_array, version):
+def create_schema(name, field_dictionary_list, version):
     """ Create a schema using a field dictionary. fastavro will automatically
     take the name and namespace and put them as one, so the name should just be
     the schema name and the namespace needs to be created separately. The
@@ -137,8 +134,8 @@ def create_schema(name, field_dictionary_array, version):
     name: `string`
         The name of the schema as a string. (e.g., `'diaSource'`).
 
-    field_dictionary_array: 'np.array'
-        An array containing dictionary entries for the individual fields.
+    field_dictionary_list: 'list'
+        A list containing dictionary entries for the individual fields.
 
     version: 'string'
         The version number of the schema.
@@ -147,7 +144,7 @@ def create_schema(name, field_dictionary_array, version):
     schema = fastavro.parse_schema({
         "name": name,
         "type": "record",
-        "fields": field_dictionary_array
+        "fields": field_dictionary_list
     })
 
     schema['namespace'] = 'lsst.v' + version
@@ -196,11 +193,9 @@ def generate_schema(apdb_filepath, schema_path, schema_version):
     for name in table_names:
 
         for table in apdb['tables']:
-            if name in table['name']:
+            if table['name'] == name:
                 field_dictionary = populate_fields(table)
                 schema = create_schema(name, field_dictionary, version_name)
-                if name == 'DiaObject':
-                    print(schema)
                 write_schema(schema, path)