Feature improved build