Changed for unneeded classes (Tag)