Added SMAC support