Updated from client hash-table to array