Refactor Tagging to not user Model methods