Re-added tags that were still used