Added build bootstrapping