Improve pkg_build command