Removed clutter, embedded metrics. Simplified API