Improved jsonld parsing