Updated Report classes to support Schema changes