HCSVLAB-235 Add final changes to Chart Parser