Updated database schema, partial database work complete