Move tags into the helper package