Add entities for a couple of common sections and use them where appropriate