Map now works with new single array implementation