Added Basic Tagging Functionality