Added encryption to token service