Attributes refactoring