Make sure new files are added

Also reduce number of lines by combining pattern matches

Change-Id: I24f9a00aa0094eb12bd0dbd4e97b3d783d68febb