Updated plotting modules