Add more info for debug mode