Modified build system