Attribute and Control refactor