Feature add tag support