add for wasabi and nigili support