Add optional limiting for snapshotting