Additional logging added