Work on encryption in new service