SMF Few changes