Add Labels support