Update samples to use snap-shots