Added Estate entity and supporting bean