Add labels support