Finally added the outbox functionality