Improved creation of entity elements on O0