Expand on section parsing