Implementing tag_key support