Add proper tag support