Setting up a more coherent tagging system