Updated plotting facility