Make snapshot code match new layout