Use logger instead of util.log