Added ability to tag with salt-grains