Improved Click Logging