Refactored transactions for consistency