Updates for initial charting sample