Migration to API 2