Add better debug logger