Added FileDependency handling