Fix a bug, and add array-backed dictionary