More updates to extend API