SES-1054 : Changes in response to feedback, and replace calls to deprecated methods with their generic counterparts