Added metrics, refactored data model