SoT class part-2 - A small addition on the software structure.