Minor optimization for dictionary loading
Improved performance test