NFM ADDITION - #001

* Added some features only in NFM 
Addition #001