Better Build scripts