Optimised ChartFactory a bit
Optimised ChartFactory a bit