Fixed: Relocate Metrics and Updater to have own instances