Improve snapshot functionality.