add ExtraJsonContext and CommandContext