Added toggles for property nesting and inclusion of original pre-inherited sections