Added proper snapshot formatting