Added primary keys to the model