Replaced tag references with class