Map now uses buffer wrapper