Added more stuff to the Entity.