First commit for EntityLimiter