Sync with Toxi core API changes