Major package refractor + Metrics + Updater