More updates for 1.10 api