Updated Metrics and AutoUpdater

Copying in the classes the first time seemed to have had an error and
replaced multiple keywords with the package.