[WIP] Attribute refactor