Fix intanstiation issues in Token class