Added logging capability for client and server side