Added better plotting support