Attributes refactored and additional value attributes added.