Updated database schema to actual field names
Updated database schema again