Improved snapshot and reporting