Added build scripts and more validation