Schema improvements