Merging separate changes in to allow more file types.