Added plotting feature