Update for 0.4 Dict changes