Added defer logic

https://appirio.my.salesforce.com/a3v50000000I5Xx