Applied smart pointers to MOD related classes