1. Localize
2. Complete IncludedLists for all classes
3. Add more checks