Update markup for the new paragraph enumeration
Change structure