Added attributes support to 'add-tag'