Changed class to data-class