Added abbility to add tags.