Added automatic schema generation