Updating more files for building