Some changes to call logger