Made appropriate changes to the inbound data schema.
Latest PR ready build for prod.