Improved plotting support