Services updated to use encoded key