consolidated schema changes