Added more files to break out logic