Switched to new build system