Added better classes to the output