Improved support for data logging