Attributes edit and other edits
Refactoring