Plotting capabilities added