Add JSON-LD improvements in serialization