Add 'jid' and 'enqueued_at' and optional options