Improved log support