Refactored Encryption services