Add comments and JSON-LD context support