added classes and data