Completed migration to API