improve schema, debug false