Added support for extension label-handling.