Enhance build