Split v3 specific dictionary loading into separate class