Fix: More complete exclusion list
Fix: missing property