Optimised ChartFactory a bit