Hacked workaround for problem of slow entity creation