use proper runtime values and add some new labels