Removed database ID columns
Added FK