Added working snapshot capability