Attribute forms reworked