SSP-867 Refactored code for reliabilty and robustness