Extract Address into its own embeddable type
Forgot city in address object
Slightly modify table name