Update to the new buildout