Added handling of IsPrimaryKey and IdGenerator