Enhance support for the "metrics" action
Add support for TCL