Make chart services better