Re-incorporate Areas and Property views