Change logging mechanism, log the caller to make log more useful