Schema adjustments