Refactored DataSnaphshot