Updating build to be more standard