improve buildout speed