Added token service back in