Use the new Dict behaviour