Compliance with the new buildout requirements
Fix setup