Clean imports
Add metrics to all and add metrics to facia-tool application metrics