Major attributes refactoring.