improved build definitions