Added data-class attribute functionality