Addressing breaking IFileSystem changes

@pranavkm