Simplified the EntryModelGenerator
Polymorphic Keywords