Added metrics collection to Hyperspace