Added config specific token handling