Updates to Array handling.