Re-design attribute save mechanism