ENH: Update to second chart with convenience methods