Added widget tag support