Uniform attributes refactoring.