Adding further label handling