Tag class refactored. More specs