performance tuning and schema update