Adds tag support