Fixing entities init