Additional logging (16/48)

Additional logging