Better organisation of plot types