Add 'primaryKey' and 'primaryKeyField' to Entity