Extending entities generator even more