Moved class from the first attribute to the last attribute and reorganized the
data to better work with the scripts