More refactoring bringing the plot functions from child to parent