Added hid to primary keys of all of them