use new C* 2.1.1 sytax for adding attributes

The new supported syntax makes its easier to add new attributes since we can
now pass a whole map which will be additive. Previously passing an entire map
would be result in overwriting an existing map.