Added support for schema from file or generated