Adding support for multiple chart types