Updated tags definition