@prabhuamol I switched this over to use the underlying implementation in SalesforceCommonUtils.