Added logic on SAMI support