Adding changes for FileCount metric