Refactored existing code and added support for symmetric encryption.

Fixed.