Prepare for API move