[Expenditure Tracking] Refactored to comply with the latest generated API