Updating and optimizing Outbox Command