Tidied up inheritance of metrics