Added JSON-defined structures