Add more options to support concatinated files in various locations.