Make better use of fit convert in sdk