Adding the no-build option