Updated for new PlotMe-Core