Updated the Shinobi charting framework