Moved stuff to use the logger