Impruve build script