Fixing map entity initialization steps.