Prepared json validation and incorporated wombats fixes