Token support
Translation fix
Authentication fixes