Update because Dict api changed