Now loading arrays instead of map