Update for build system changes