Modified the mapping a bit, changed the way labels are assembled