Added metrics class