Added AMD and Almond support.