Updated buildout