Updated database schema to match the fields on the form