Update to API Changes