Build can now be very tolerant for DIT environment