Add a few more types and enumeration conditions.