#629 Extend label information