Updated constructor and added token set method