Performance improvement for SnapShot parser.