Missing arrays

Change-Id: I6bc4edac3416d9ab48931a293b33288c27fb4624