Improved build command