CONN-1300: Updated the code...