Code values are now stored in dict structures