Add amami support