#32 disabling old add/set logic
#32 replacing attributes with options