Attr save refactor