Override default json export, adding typed organisations