Added Metrics

Added Metrics
Updated version to 2.1
Fixed missing imports.