[KFData] Fix circular dependency issues