Strict domain processing added