Match new plot API