Fix `entry` mapping