added labels support - still needs testing