Add support for tagged versions