Class Tag improved