Added ability to add/update attributes