Added plotting capabilities