Address domain model now has options with default value of None