Moved all arrays to object