Moved to SectionProps CPP / Prepare for optimize