Updated tags field support