Changed to JSON-Schema