Added logger support