DC21-510 & DC21-498: Add structured logs, fix bug
with wrapper