Improved build targets of builder