Removed additional fields from Address