Updated support for build tools 20