Add support for File-properties combination