Update for API Changes