Split v2 specific dictionary loading into a separete class