Added metrics-support