#3 extend descriptor mappers to support additional labels