Added support for AMD and CMD