Revert template changes
Metrics updates