Next features in SS imlpementation