added resolve tokens