added billing cycles migration and de-coupled service type from user profile.