Updating JSON and Query operation and types templates to match state of the art .. XML