INFRASYS-3702: changes required to work with pillar data