Commit

Improved sapi support