Refactor Attributes to store only primitives