Add support for extended marketplace labels