Enhanced Entities Generator