Additional logging (18/48)

Additional logging