Updated the build to contain all the latest functionality