Added array tracking