Enhance Job and Build model