Fine tweaking the auto generated skus logic. TRAD-32