Added arrays and maps