Updated to latest build system