Update to latest + make dispatch api hookable