Add analyitcs
discovery: name parsing fix