Added labels support