Please review branch feature/metricfacade