Add more tag support