In the process of adding tagging architecture