XLS-548 Changed to use arrays