Getting rid of dependency to MMS