Updated options for build scripts