Updated chart helper