Mange buildout properly