Updated to the latest build system