Updates based on iteration 4 with GlueDB payload generation