Add more types and variation, avoid more known issues.