Tweak for dict build