Implemented better client side logging