Additional logging (17/48)

Additional logging