updated framework for metrics