Split out word mapping into a different object