Updated tables to include primary and foreign key relationship