Better handling of short schema lists