Added primaryKey flag to field