Important updates: remove dependency on M4J libraries