Add tag support.