More flexibility on array key handling