Supporting more files variations