Add Spark reporting refactored