Changed building methods for allow external command line parameters