[KFData 1.0.0-RC2] Fix circular dependency issues