Added tagging functionality to address issue #4