Improve dramaticaly the speed of entity creation