Updated Logging, added support for client as well