Better logging.
Extract Hub type.