Updated source files with latest changes