Added support for multiple charts