improved build infrastructure