Changes to include more files as part of the build