Added TODO about array fields