Adjust to updated Kazuki API