Switched to buildout 2.0