Adding better tagging interface.