Add two modules to support for AMD and CMD