Added AMD modules compatibility