Added option to manually set token