Add more runtime metrics. Not really work