Changed definitions to match json proccessor