Add CI.Attributes, Update data design.