Added more tag support.