Added token table (I'd rather this be in memory, but we need persistence too)