Change tagging to use hashes