Updated database schema for 2.1.1