More attr/value refactoring