SONG class Refectoring