Laid the groundwork for the :map option