Map now takes size arguments