V2.0 with tags, notes and more mapped fields