Replaced $OldId with $origin.
Updated files to latest framework version.