improved entity system