Migration to KFService 1