Added logging to classes