Add support for sapi