ZSS-697 Enhance the Chart engine