Added primary keys on some tables