Additional logging (21/48)

Additional logging