Introduced Labels map, simplified WithLabels to With.

Change-Id: Ieb0778a3b48a67c5d64b0ee7d8083b9e051b576a