Handle more files