Introduce includeSnapshots option