Improve snapshot accuracy and metric collection on activity timing

Improve snapshot accuracy and metric collection on activity timing