Changing the tag implementtion

Changed it to a case class so that we don't even have to extract the name