Merge "Refactor snapshot code"