Updated database tables to fix primary key confilct