Wafaa/ADEF modifications for usage with image archives