Implement tagging feature Close #11