Updates to Array handling