add keys and values refs and keep_if enumeration