Enhance build system