Add tagging
Integrate tagging with db