Optimize finding property Id for unit Create directory in both FileManager saveFile and saveBinaryFile