Added code for reporting