Add: complex image scan. Clean up