Updated Build scripts