Added Key Exchange Support