Add logger and more info printing