Audit, error and retry queuing added