[DF-845] Replaced String to FilePath for some cases