Added: Metrics

And better version numbers from CI