WIP - Enhance report

WIP - Enhance report