Changed some things in the Entity class family.