RF: Improve plotting flexibility