Add iterators and ConfigEntry