Added extended token and removed Facebook keys