Added buildout support