Updated chart support