Consolidate json parsing
Add 409