Updated Buildout sections based on upstream