Updated to new outbox api