More wip for schema generation