Made it possible for entities to be in different states