Adapt to new funken api