Better module/artifact matching.