Adding primary keys for some tables