Update to work with Chart 1.0