Refactored to split the transaction commit from save flow <Nithya>