Updated entity system