Works with latest Sufia