Analysis changes to sst mapping