Finish new API integration