Added Buildout 2 support