Moved to controls
All attributes are now multivalued