Added some stuff for metrics