Add support for user-defined labels