Filled in gaps (h/t DCPS) and generated JSON