JSON schema generation should work much better now