Added client_id to log messages