Made iterator key format match array format