Added AMD module compatibility