Chenges to implement hlr2ssm feature