Improved build list