Added schema auto-generation