Progress on integrating the new API