Add support for non-exclusive tags