Refactored report classes.