Improved "Add Assignment"