Add management of splitting tags