Refactor Fields in Type + Attributes