Better build script added