Updates based on iteration 3 with GlueDB payload generation