Changed map to array