Early work to enable tags