Update to local 3.10 API