Make plotting optional