Also add tags for 2.0 mode