Added entity system