Continued to add class for data