Better structure for js sections, parsing plan with new structure