Make plotting setup more flexible