Update to use base logger