Better jsonld support