Improved support for dot output