added more primary keys