Added some more metrics and scripts