Added additional fields on Address model