Updated source files from upstream