Fixed schema generation